Ship MinGW-w64 runtime DLLs along with `rust-lld.exe` for `-pc-windows-gnu` targets #128876

ColinFinck · 2024-08-09T13:05:11Z

rust-lld.exe built for x86_64-pc-windows-gnu depends on libgcc_s_seh-1.dll and libwinpthread-1.dll from MinGW-w64. Until now, they were not shipped alongside rust-lld.exe, and you could not run rust-lld.exe on most systems.

This problem didn't surface until now because:

Most targets don't use rust-lld by default.
Some people had these DLLs in their PATH from some other MinGW binary.
rustup used to add bin to the PATH, which contains these DLLs for rustc.exe. But it no longer does that: rust-lang/rustup@ce3c09a

Fixes #125809

try-job: dist-x86_64-mingw

rustbot · 2024-08-09T13:05:19Z

r? @Kobzol

rustbot has assigned @Kobzol.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

Kobzol

Bootstrap-wise, these changes look OK, but I don't know a lot about windows-gnu and don't have Windows prepared for testing this.

@jieyouxu could you please try to check it on Windows?

ChrisDenton · 2024-08-11T13:18:36Z

cc @mati865

jieyouxu · 2024-08-11T13:30:48Z

@jieyouxu could you please try to check it on Windows?

I can try a bit later, but no guarantees to reproduce ci environment

jieyouxu · 2024-08-11T14:15:40Z

@Kobzol wait what am I supposed to be testing here? Or rather, what's the canonical example that I should try to build with a x86_64-pc-windows-gnu host compiler that used to fail but would pass with this PR?

Kobzol · 2024-08-11T14:17:48Z

I suppose that the goal is to check whether LLD can be used on windows-gnu if you also meet all the requirements described in this PR's description 😅 @ColinFinck Could you describe some reproduction guide to make it easier to test whether this works as intended on Windows?

ColinFinck · 2024-08-12T14:27:59Z

@Kobzol @jieyouxu To reproduce the problem for the current Rust 1.80.0 release, follow these steps on a Windows Command Prompt (cmd):

rustup default 1.80.0-x86_64-pc-windows-gnu
set PATH=%USERPROFILE%\.cargo\bin

cargo new testproject
cd testproject
set RUSTFLAGS=-Clinker=rust-lld
cargo build

This will show a message box about a DLL not being found, followed by a linking with rust-lld failed: exit code: 0xc0000135 error on the command line.
set PATH is important here to ensure that only Rust-provided DLLs are tried.

My PR fixes this by putting the missing DLLs into the right place.

…s-gnu` targets `rust-lld.exe` built for `x86_64-pc-windows-gnu` depends on `libgcc_s_seh-1.dll` and `libwinpthread-1.dll` from MinGW-w64. Until now, they were not shipped alongside `rust-lld.exe`, and you could not run `rust-lld.exe` on most systems. This problem didn't surface until now because: * Most targets don't use `rust-lld` by default. * Some people had these DLLs in their `PATH` from some other MinGW binary. * `rustup` used to add `bin` to the `PATH`, which contains these DLLs for `rustc.exe`. But it no longer does that: rust-lang/rustup@ce3c09a Fixes rust-lang#125809

bors · 2024-08-20T18:17:03Z

⌛ Trying commit 71d98a8 with merge 7f116c7...

bors · 2024-08-20T19:42:54Z

☀️ Try build successful - checks-actions
Build commit: 7f116c7 (7f116c7f3b8cb1aebb226f1a978e9ebb2fda04a5)

ChrisDenton · 2024-08-20T20:54:39Z

Ok, so if anyone wants to try this then they can install it locally using:

cargo install rustup-toolchain-install-master
rustup-toolchain-install-master 7f116c7f3b8cb1aebb226f1a978e9ebb2fda04a5 -i x86_64-pc-windows-gnu -c cargo rust-std rust-mingw

EDIT: updated the toolchain install command to add missing components.

mati865 · 2024-08-20T21:54:56Z

Apparently ld.exe doesn't need libgcc_s_*-1.dll for some reason.

It's written in C, so it doesn't pull in libstdc++. LLVM (and therefore LLD) built by Rust has statically linked libstdc++.

ChrisDenton · 2024-08-21T10:05:34Z

I think I missed some needed components from my install instructions. I've updated them. You may need to also use --force to reinstall.

jieyouxu · 2024-08-21T10:26:27Z

I think I missed some needed components from my install instructions. I've updated them. You may need to also use --force to reinstall.

I can confirm whatever the CI built Works On My Machine™. So this LGTM (insofar as whatever the CI built is what the end users get)!

Repro instructions:

cargo install rustup-toolchain-install-master
rustup-toolchain-install-master 7f116c7f3b8cb1aebb226f1a978e9ebb2fda04a5 -i x86_64-pc-windows-gnu -c cargo rust-std rust-mingw

then in PowerShell

> $env:PATH="$TOOLCHAIN\lib\rustlib\x86_64-pc-windows-gnu\bin;$TOOLCHAIN\bin"
> $env:RUSTFLAGS="-Clinker=rust-lld"
> cargo -vV // <- checked is from built toolchain
> cargo build // a new hello_world project from `cargo new --bin`

seems to work without any missing DLL errors 👍

jieyouxu · 2024-08-21T10:31:08Z

Feel free to also r=me.

ColinFinck · 2024-08-22T09:59:41Z

Can also confirm that the CI-built toolchain of this PR does exactly what it's supposed to do and fixes #125809
Would love to see this being merged :)

ColinFinck · 2024-08-22T10:03:07Z

@rustbot ready

jieyouxu · 2024-08-22T10:15:01Z

AFAICT this is good to go, therefore:

@bors r=Kobzol,petrochenkov,jieyouxu

bors · 2024-08-22T10:15:03Z

📌 Commit 71d98a8 has been approved by Kobzol,petrochenkov,jieyouxu

It is now in the queue for this repository.

jieyouxu · 2024-08-22T10:17:12Z

May the machine gods bless windows-gnu and may this target be free from bugs 🙏

…lls, r=Kobzol,petrochenkov,jieyouxu Ship MinGW-w64 runtime DLLs along with `rust-lld.exe` for `-pc-windows-gnu` targets `rust-lld.exe` built for `x86_64-pc-windows-gnu` depends on `libgcc_s_seh-1.dll` and `libwinpthread-1.dll` from MinGW-w64. Until now, they were not shipped alongside `rust-lld.exe`, and you could not run `rust-lld.exe` on most systems. This problem didn't surface until now because: * Most targets don't use `rust-lld` by default. * Some people had these DLLs in their `PATH` from some other MinGW binary. * `rustup` used to add `bin` to the `PATH`, which contains these DLLs for `rustc.exe`. But it no longer does that: rust-lang/rustup@ce3c09a Fixes rust-lang#125809 try-job: dist-x86_64-mingw

Rollup of 7 pull requests Successful merges: - rust-lang#126985 (Implement `-Z embed-source` (DWARFv5 source code embedding extension)) - rust-lang#128349 (Enable `f16` on x86 and x86-64) - rust-lang#128876 (Ship MinGW-w64 runtime DLLs along with `rust-lld.exe` for `-pc-windows-gnu` targets) - rust-lang#129190 (Add f16 and f128 to tests/ui/consts/const-float-bits-conv.rs) - rust-lang#129257 (Allow rust staticlib to work with MSVC's /WHOLEARCHIVE) - rust-lang#129386 (Use a LocalDefId in ResolvedArg.) - rust-lang#129400 (Update `compiler_builtins` to `0.1.120`) r? `@ghost` `@rustbot` modify labels: rollup

mati865 · 2024-08-22T22:01:46Z

May the machine gods bless windows-gnu and may this target be free from bugs 🙏

Sorry, could not resist: https://youtu.be/EIWHvPP0U64?si=ZpitnEb2lNjQSSJ9

…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#127623 (fix: fs::remove_dir_all: treat internal ENOENT as success) - rust-lang#128876 (Ship MinGW-w64 runtime DLLs along with `rust-lld.exe` for `-pc-windows-gnu` targets) - rust-lang#129055 (Migrate `x86_64-fortanix-unknown-sgx-lvi` `run-make` test to rmake) - rust-lang#129386 (Use a LocalDefId in ResolvedArg.) - rust-lang#129400 (Update `compiler_builtins` to `0.1.120`) - rust-lang#129414 (Fix extern crates not being hidden with `doc(hidden)`) - rust-lang#129417 (Don't trigger refinement lint if predicates reference errors) - rust-lang#129433 (Fix a missing import in a doc in run-make-support) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#128876 - ColinFinck:rust-lld-with-runtime-dlls, r=Kobzol,petrochenkov,jieyouxu Ship MinGW-w64 runtime DLLs along with `rust-lld.exe` for `-pc-windows-gnu` targets `rust-lld.exe` built for `x86_64-pc-windows-gnu` depends on `libgcc_s_seh-1.dll` and `libwinpthread-1.dll` from MinGW-w64. Until now, they were not shipped alongside `rust-lld.exe`, and you could not run `rust-lld.exe` on most systems. This problem didn't surface until now because: * Most targets don't use `rust-lld` by default. * Some people had these DLLs in their `PATH` from some other MinGW binary. * `rustup` used to add `bin` to the `PATH`, which contains these DLLs for `rustc.exe`. But it no longer does that: rust-lang/rustup@ce3c09a Fixes rust-lang#125809 try-job: dist-x86_64-mingw

rustbot assigned Kobzol Aug 9, 2024

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Aug 9, 2024

This comment has been minimized.

Sign in to view

ColinFinck force-pushed the rust-lld-with-runtime-dlls branch 2 times, most recently from a39d8ab to 7fbb1cb Compare August 9, 2024 13:17

ColinFinck mentioned this pull request Aug 9, 2024

rust stable 1.78 using 'x86_64-pc-windows-gnu' host tool to build 'thumbv7em-none-eabihf' arm bare metal target got rust-lld failed #125809

Closed

Kobzol reviewed Aug 11, 2024

View reviewed changes

This comment was marked as resolved.

Sign in to view

rustbot added has-merge-commits PR has merge commits, merge with caution. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 13, 2024

This comment was marked as resolved.

Sign in to view

ColinFinck force-pushed the rust-lld-with-runtime-dlls branch from 30aab08 to f94c872 Compare August 13, 2024 15:48

rustbot removed has-merge-commits PR has merge commits, merge with caution. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 13, 2024

ColinFinck force-pushed the rust-lld-with-runtime-dlls branch from f94c872 to a29b75a Compare August 13, 2024 15:52

This comment has been minimized.

Sign in to view

ColinFinck mentioned this pull request Aug 13, 2024

Slightly refactor TargetSelection in bootstrap #128983

Merged

ColinFinck force-pushed the rust-lld-with-runtime-dlls branch from a29b75a to 71d98a8 Compare August 13, 2024 16:15

This comment was marked as resolved.

Sign in to view

jieyouxu approved these changes Aug 21, 2024

View reviewed changes

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 22, 2024

ColinFinck requested a review from petrochenkov August 22, 2024 10:03

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 22, 2024

tgross35 mentioned this pull request Aug 22, 2024

Rollup of 7 pull requests #129407

Closed

petrochenkov approved these changes Aug 22, 2024

View reviewed changes

matthiaskrgr mentioned this pull request Aug 23, 2024

Rollup of 8 pull requests #129443

Merged

bors merged commit 6a1418a into rust-lang:master Aug 23, 2024
7 checks passed

rustbot added this to the 1.82.0 milestone Aug 23, 2024

Ship MinGW-w64 runtime DLLs along with rust-lld.exe for -pc-windows-gnu targets #128876

Ship MinGW-w64 runtime DLLs along with rust-lld.exe for -pc-windows-gnu targets #128876

Uh oh!

Conversation

ColinFinck commented Aug 9, 2024 • edited by ChrisDenton Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Aug 9, 2024

Uh oh!

This comment has been minimized.

Kobzol left a comment

Choose a reason for hiding this comment

Uh oh!

ChrisDenton commented Aug 11, 2024

Uh oh!

jieyouxu commented Aug 11, 2024

Uh oh!

jieyouxu commented Aug 11, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Kobzol commented Aug 11, 2024

Uh oh!

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

ColinFinck commented Aug 12, 2024

Uh oh!

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

This comment has been minimized.

bors commented Aug 20, 2024

Uh oh!

bors commented Aug 20, 2024

Uh oh!

ChrisDenton commented Aug 20, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mati865 commented Aug 20, 2024

Uh oh!

This comment was marked as resolved.

ChrisDenton commented Aug 21, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jieyouxu commented Aug 21, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jieyouxu commented Aug 21, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ColinFinck commented Aug 22, 2024

Uh oh!

ColinFinck commented Aug 22, 2024

Uh oh!

jieyouxu commented Aug 22, 2024

Uh oh!

bors commented Aug 22, 2024

Uh oh!

jieyouxu commented Aug 22, 2024

Uh oh!

mati865 commented Aug 22, 2024

Uh oh!

Uh oh!

Uh oh!

Ship MinGW-w64 runtime DLLs along with `rust-lld.exe` for `-pc-windows-gnu` targets #128876

Ship MinGW-w64 runtime DLLs along with `rust-lld.exe` for `-pc-windows-gnu` targets #128876

ColinFinck commented Aug 9, 2024 •

edited by ChrisDenton

Loading

jieyouxu commented Aug 11, 2024 •

edited

Loading

ChrisDenton commented Aug 20, 2024 •

edited

Loading

ChrisDenton commented Aug 21, 2024 •

edited

Loading

jieyouxu commented Aug 21, 2024 •

edited

Loading

jieyouxu commented Aug 21, 2024 •

edited

Loading